(custom-make-dependencies): Fix previous change.

diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 9156bcec3bf9ab328fa23c667e7308a79557cebf..a73569203abe3d1a8e2adc83cfdd872c22f4635a 100644 (file)
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -87,7 +87,17 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
                    item where found)
                (when members
                  ;; So x and no-x builds won't differ.
-                 (setq members (sort (copy-sequence members) 'string<))
+                 (setq members
+                       (sort (copy-sequence members) 
+                             (lambda (x y)
+                               (cond ((and (stringp x) (stringp y))
+                                      (string< x y))
+                                     ;; Put all non-strings before strings.
+                                     ((stringp y) t)
+                                     ((stringp x) nil)
+                                     ;; For two non-strings,
+                                     ;; use the order they appear in MEMBERS.
+                                     (t (member y (member x members)))))))
                  (while members
                    (setq item (car (car members))
                          members (cdr members)